Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 23 Jul 2011 16:12:03 +0000 (09:12 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 23 Jul 2011 16:12:03 +0000 (09:12 -0700)

Trivial merge